From f2322ebeb406ea20c4972ba38e57dc3b3f7a2fbe Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sat, 29 Aug 1998 22:27:47 +0000 Subject: [PATCH] quell some warnings with g_hash_table_new * gdk/gdkcolor.c: (gdk_colormap_new) (gdk_colormap_get_system): quell some warnings with g_hash_table_new * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery when we're done with it * gtk/itemfactory.c: (gtk_item_factory_from_path): (gtk_item_factory_create_item): free some strings * gtk/gtklabel.c: (gtk_label_finalize): free label->pattern when done (gtk_label_parse_uline): null terminate pattern string, delete some duplicated code * gtk/testthreads.c: add #include for sleep() -Yosh --- ChangeLog | 20 ++++++++++++++++++++ ChangeLog.pre-2-0 | 20 ++++++++++++++++++++ ChangeLog.pre-2-10 | 20 ++++++++++++++++++++ ChangeLog.pre-2-2 | 20 ++++++++++++++++++++ ChangeLog.pre-2-4 | 20 ++++++++++++++++++++ ChangeLog.pre-2-6 | 20 ++++++++++++++++++++ ChangeLog.pre-2-8 | 20 ++++++++++++++++++++ gdk/gdkcolor.c | 8 ++++---- gdk/x11/gdkcolor-x11.c | 8 ++++---- gtk/gtkaccelgroup.c | 2 ++ gtk/gtkitemfactory.c | 7 ++++++- gtk/gtklabel.c | 5 +++-- gtk/testthreads.c | 1 + tests/testthreads.c | 1 + 14 files changed, 161 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f4172b468..965a40f80f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4f4172b468..965a40f80f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4f4172b468..965a40f80f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4f4172b468..965a40f80f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4f4172b468..965a40f80f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4f4172b468..965a40f80f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4f4172b468..965a40f80f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +Sat Aug 29 14:50:56 PDT 1998 Manish Singh + + * gdk/gdkcolor.c: + (gdk_colormap_new) (gdk_colormap_get_system): + quell some warnings with g_hash_table_new + + * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery + when we're done with it + + * gtk/itemfactory.c: + (gtk_item_factory_from_path): + (gtk_item_factory_create_item): free some strings + + * gtk/gtklabel.c: + (gtk_label_finalize): free label->pattern when done + (gtk_label_parse_uline): null terminate pattern string, delete + some duplicated code + + * gtk/testthreads.c: add #include for sleep() + Tue Aug 25 16:52:47 1998 Owen Taylor * gtk/gtktext.c (recompute_geometry): Make sure the diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index fa810473e6..36b6c8593c 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -71,8 +71,8 @@ gdk_colormap_new (GdkVisual *visual, private->info = g_new0 (GdkColorInfo, colormap->size); colormap->colors = g_new (GdkColor, colormap->size); - private->hash = g_hash_table_new (gdk_color_hash, - gdk_color_equal); + private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, + (GCompareFunc) gdk_color_equal); private->private_val = private_cmap; private->xcolormap = XCreateColormap (private->xdisplay, gdk_root_window, @@ -259,8 +259,8 @@ gdk_colormap_get_system (void) private->info = g_new0 (GdkColorInfo, colormap->size); colormap->colors = g_new (GdkColor, colormap->size); - private->hash = g_hash_table_new (gdk_color_hash, - gdk_color_equal); + private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, + (GCompareFunc) gdk_color_equal); gdk_colormap_sync (colormap, TRUE); } diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index fa810473e6..36b6c8593c 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -71,8 +71,8 @@ gdk_colormap_new (GdkVisual *visual, private->info = g_new0 (GdkColorInfo, colormap->size); colormap->colors = g_new (GdkColor, colormap->size); - private->hash = g_hash_table_new (gdk_color_hash, - gdk_color_equal); + private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, + (GCompareFunc) gdk_color_equal); private->private_val = private_cmap; private->xcolormap = XCreateColormap (private->xdisplay, gdk_root_window, @@ -259,8 +259,8 @@ gdk_colormap_get_system (void) private->info = g_new0 (GdkColorInfo, colormap->size); colormap->colors = g_new (GdkColor, colormap->size); - private->hash = g_hash_table_new (gdk_color_hash, - gdk_color_equal); + private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, + (GCompareFunc) gdk_color_equal); gdk_colormap_sync (colormap, TRUE); } diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 16895e79b7..051ea10719 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -379,6 +379,8 @@ gtk_accel_group_add (GtkAccelGroup *accel_group, return; } + g_free (query); + /* prematurely abort if the group/entry is already locked */ if (accel_group->lock_count > 0) diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 74054e8b22..6a592a7f86 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -628,6 +628,9 @@ gtk_item_factory_from_path (const gchar *path) fname[i + 1] = 0; item = g_hash_table_lookup (class->item_ht, fname); + + g_free (fname); + if (item && item->widgets) return gtk_item_factory_from_widget (item->widgets->data); @@ -1006,7 +1009,7 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory, if (!gtk_item_factory_parse_path (entry->path, &path, &parent_path, &name)) return; - + parent = gtk_item_factory_get_widget (ifactory, parent_path); if (!parent) { @@ -1104,6 +1107,8 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory, callback_type, item_type_path, widget); + + g_free (path); } void diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 9606ef549d..3c920cd2bc 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -315,6 +315,7 @@ gtk_label_finalize (GtkObject *object) label = GTK_LABEL (object); g_free (label->label); + if (label->pattern) g_free (label->pattern); gtk_label_free_rows (label); (* GTK_OBJECT_CLASS (parent_class)->finalize) (object); @@ -590,7 +591,6 @@ gtk_label_parse_uline (GtkLabel *label, p = string; q = name; r = pattern; - underscore = FALSE; while (*p) { @@ -621,7 +621,8 @@ gtk_label_parse_uline (GtkLabel *label, p++; } *q = 0; - + *r = 0; + gtk_label_set (label, name); gtk_label_set_pattern (label, pattern); diff --git a/gtk/testthreads.c b/gtk/testthreads.c index 71527d13d1..6ce38f369c 100644 --- a/gtk/testthreads.c +++ b/gtk/testthreads.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ #include +#include #include #include "../config.h" diff --git a/tests/testthreads.c b/tests/testthreads.c index 71527d13d1..6ce38f369c 100644 --- a/tests/testthreads.c +++ b/tests/testthreads.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ #include +#include #include #include "../config.h" -- 2.30.2